GtkIconTheme: Copy all fields in icon_info_dup
authorMatthias Clasen <mclasen@redhat.com>
Mon, 23 Jun 2014 16:20:59 +0000 (12:20 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Mon, 23 Jun 2014 16:20:59 +0000 (12:20 -0400)
This functionality is only exercised by gnome-shell, currently.
Therefore, forgetting to copy a field here means an instant
gnome-shell crash :-(. More tests needed.

gtk/gtkicontheme.c

index 8a1f83568e3bc116d8232f341544b4cb1ba21641..1d2efd446a78ff2c75acc7cc10a013ed52db51d6 100644 (file)
@@ -3350,11 +3350,16 @@ icon_info_dup (GtkIconInfo *icon_info)
   if (icon_info->cache_pixbuf)
     dup->cache_pixbuf = g_object_ref (icon_info->cache_pixbuf);
 
+  dup->scale = icon_info->scale;
   dup->unscaled_scale = icon_info->unscaled_scale;
   dup->desired_size = icon_info->desired_size;
   dup->desired_scale = icon_info->desired_scale;
   dup->forced_size = icon_info->forced_size;
   dup->emblems_applied = icon_info->emblems_applied;
+  dup->is_resource = icon_info->is_resource;
+  dup->min_size = icon_info->min_size;
+  dup->max_size = icon_info->max_size;
+  dup->symbolic_size = icon_info->symbolic_size;
 
   return dup;
 }